merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:29:35 +0000 (10:29 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 26 Aug 2010 01:29:35 +0000 (10:29 +0900)
commit2614473a941a3f74a8065966d78e88498d9d6ce8
treeb985f4d8282937898b5f1ed75d1d8b31c04505cc
parent790f8d5dcde226788be1bc0be8c3bccbd8be80a5
parentb8c4f61abe6cd79be1890e75fe54665018ae29e6
merge trunk